From 8d07911d73e7694b14b2a58a7d832c6fb1e9b204 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Mar 2014 22:47:10 -0400 Subject: [PATCH] Work around gcc stupidity With -Wc++-compat, gcc warns about 'and' even in contexts where it poses absolutely no danger. https://bugzilla.gnome.org/show_bug.cgi?id=726136 --- gtk/gtkwidget.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index bf47657b39..9e2a4a4d69 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -946,7 +946,8 @@ GDK_AVAILABLE_IN_ALL void gtk_widget_set_allocation (GtkWidget *widget, const GtkAllocation *allocation); -GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_width and gtk_widget_get_preferred_height) +GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_width & gtk_widget_get_preferred_height) + void gtk_widget_get_requisition (GtkWidget *widget, GtkRequisition *requisition); -- 2.30.2